Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Make moveit_servo listen to Octomap updates (backport #2601) #2606

Merged
merged 3 commits into from
May 10, 2024
Merged

Make moveit_servo listen to Octomap updates (backport #2601) #2606

merged 3 commits into from
May 10, 2024

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Dec 14, 2023

This is an automatic backport of pull request #2601 done by Mergify.
Cherry-pick of 87d5945 has failed:

On branch mergify/bp/humble/pr-2601
Your branch is up to date with 'origin/humble'.

You are currently cherry-picking commit 87d594540.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   moveit_ros/moveit_servo/src/utils/common.cpp

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

@amalnanavati @mergify
Make moveit_servo listen to Octomap updates (#2601)
c8f1408 
* Start servo's world geometry monitor

* Typo fix

---------

Co-authored-by: Amal Nanavati <[email protected]>
(cherry picked from commit 87d5945)

# Conflicts:
#	moveit_ros/moveit_servo/src/utils/common.cpp
@mergify mergify bot added the conflicts label Dec 14, 2023
@codecov Codecov
Copy link

codecov bot commented Dec 14, 2023 •
edited
Loading

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 51.32%. Comparing base (3144e6e) to head (eb279ca).
Report is 9 commits behind head on humble.

Additional details and impacted files 
@@            Coverage Diff             @@
##           humble    #2606      +/-   ##
==========================================
+ Coverage   50.95%   51.32%   +0.38%     
==========================================
  Files         382      382              
  Lines       31894    31890       -4     
==========================================
+ Hits        16247    16363     +116     
+ Misses      15647    15527     -120

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@amalnanavati
Copy link
Contributor

amalnanavati commented Dec 14, 2023 •
edited
Loading

Yup backporting to humble via cherry-picking will be pretty involved, since the servo code underwent a lot of restructuring. The one-line change that was applied in moveit_Servo/src/utils/common.cpp in main (code here) needs to instead be made in moveit_servo/src/servo_node.cpp in humble (code here). Also note that planning_scene_monitor in main needs to be changed to planning_scene_monitor_ in humble.

I'm happy to make the change, although I'm not sure about the norms re. fixing backports. Let me know if y'all have a preferred way of doing this!

@github-actions GitHub Actions
Copy link

This PR is stale because it has been open for 45 days with no activity. Please tag a maintainer for help on completing this PR, or close it if you think it has become obsolete.

@github-actions github-actions bot added the stale Inactive issues and PRs are marked as stale and may be closed automatically. label Jan 30, 2024
@amalnanavati
Copy link
Contributor

@henningkayser can this be merged?

@github-actions github-actions bot removed the stale Inactive issues and PRs are marked as stale and may be closed automatically. label Jan 31, 2024
@github-actions GitHub Actions
Copy link

This PR is stale because it has been open for 45 days with no activity. Please tag a maintainer for help on completing this PR, or close it if you think it has become obsolete.

@github-actions github-actions bot added the stale Inactive issues and PRs are marked as stale and may be closed automatically. label Mar 18, 2024
@amalnanavati
Copy link
Contributor

amalnanavati commented Mar 18, 2024 •
edited
Loading

@henningkayser @sea-bass is there something we're waiting on for this PR to be merged?

@github-actions github-actions bot removed the stale Inactive issues and PRs are marked as stale and may be closed automatically. label Mar 19, 2024
@github-actions GitHub Actions
Copy link

This PR is stale because it has been open for 45 days with no activity. Please tag a maintainer for help on completing this PR, or close it if you think it has become obsolete.

@github-actions github-actions bot added the stale Inactive issues and PRs are marked as stale and may be closed automatically. label May 10, 2024
@sjahr sjahr merged commit a812d57 into humble May 10, 2024
7 checks passed
@sjahr sjahr deleted the mergify/bp/humble/pr-2601 branch May 10, 2024 13:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@henningkayser henningkayser henningkayser approved these changes

@sjahr sjahr sjahr approved these changes

Assignees
No one assigned
Labels
conflicts stale Inactive issues and PRs are marked as stale and may be closed automatically.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@amalnanavati @henningkayser @sjahr